Fix for issue#1 on GitHub