Bugfix: return variable code