Fixed #408