fix #61
#62 in progress