Fix for issue 279