Fix #496