Fixed bug whith invoking wrong methods