fixed jon's bug