Fix for #4