Fixed a BB that was introduced by chaning the type of properties.