fixed josh's bug