Fixed for sword 1.7.0