fix for issue #22
fix for issue #22
cleanup