CollisionShape incorrect for scaled spatials

I think the problem here is that when you add a static RigidBodyControl to a geometry and scale the node the geometry is attached to the scaling of the node will just be ignored, because the control doesn’t even know the node.
Is there an option to just add a rigidbodycontrol to that collision geometry and make it know the father (“Scene”) without rewriting RigidBodyControl itself ???

EDIT:

I have a solution for now, I am not very happy with that but it works for me for now. I created a empty class, copy and pasted the whole CollsionShapeFactory. Then I changed the following line in the createCompoundShape method.
From:

} else if (spatial instanceof Geometry) {

To:

} else if (spatial instanceof Geometry && (spatial.getName().equals("Collision") || spatial.getName().equals("CollisionBox"))) {

It is like a filter, only geometries with this name will be added to the collision shape.

I would really appreciate it, if someone could provide a cleaner solution.