Fix for #3