WIP issue #49 again. BoneCP is weird...