Fixed a bug from GAbri