Fix no previous handler