Added compatibility to 1.6 and 1.7