Fixed bug with Organisation check