More work on #50. Fixes 3)