Last frame bug fixed