Fixed super bad bug