[#267] Stop new error related to organisation