Fix for issue #185