Added backwards compatibility for 4.41