Fixed backwards compatibility issue #SRV-13 fixed