Fix for a nasty bug after investigating for #21