Fix #101, #106