fixed + 1 problem