Fixed crash for 1.7 clients