Fix property bug