fixing commit 8d1b514, issue #5