NH-3222

https://nhibernate.jira.com/browse/NH-3222
Fixed with unit tests
This feels wrong.