fixing multiple execution issues