Fixed properties crashing bug