Fixes issue #11. It is not a solution as suggested, but definitely a bit better one.