Fix bug (maybe more luck this time)