Fix #3 and #52