some fixes after cut ;-)