Hot fix - old methods fixed