Revive Issues resolved

Core:\n- Fixed an issue caused by automatic optimization of code which broke revive flow >.>