Fixing #500