#174 fix and added unit test

Fix for #174. I'm not so happy on the string compare for the solution, but I don't have `Types` (type utils) available here. 

Added unit test to demonstrate problem and fix.