Fix #52, #53