Fix for issue#61