Fixes 

7a4796f should fix bug 2) from #1278