cleanup fix #20