fixed problem with backwards compatibility