adding some code to fix #23