Fixed issue brought up by Amine