Fixed the function call stack.
Fixed the function call stack.

Introduced a bug in active_method during the refactoring.

Change-Id: Ie73e42b0dda419c39531155db43c905790be5740

giosalv/526-aladdin,giosalv/526-aladdin,giosalv/526-aladdin,giosalv/526-aladdin