Fatal bug fixed