Fixed huge bug