Fixed Giorgios work by Diego