[FEATURE] Fix error with self variable - REady for Merge

defined variables