More code refactoring.
Fix for Maya44 / Julia