Properties bug fixed