#426 modified