Fixed the organiser bug