Custom preprocessing of properties fix