Corrected Creator-Handling