Fix for issue #278