WIP attempt another patch