Added backwards compatibility for 1be9495b83eea8d7fc233c5c76ce47bf237e1490