Fixing #237.