fixes #1951 and #1945
fix test
removed print statement
Merge pull request #1954 from digi604/fixes

fixes #1951 and #1945