Fixes on calling right procedure
WIP