Fixed for 1.6 Functionality