Fix #62 and #63