fix after prop. changes