Fix #60 Fix #50