addressing #58
fix #63