Small fix
Fix for Nucleus v4
Refactor