squashing folder bug (redmine #1835)