Bug-fix:

 - Adapt changes for 3D as well