Fixed horible BUG