Fix #494