Fix for execution