Fix for issue #1 #2