Fix #50 #49