organizator fixes