fixed Jeremy's bug