fix for issues #1 #2