Fixed big bug