Fix #604