Fix #79