Fixing #178