Fixed #604