fixed scary bug