Fixed solution collapsing
Merge pull request #177 from objcow/master

Fixed solution collapsing