Fixed a problem with backwards compatibility to 2007