Fix #53 #66