Goodnightv2 fix