Fix #488