Fixed proeprties issue