Premount fix from main