Fix for #274