Fixed 4.2 and 4.4