Fix for #42, #43