fixed jason's bug