Fix for #585
English updated thanks to Hector Cartagena