Fixed and updated for 1.6