Fix for #2