Fixed small bug overusing properties.