fixing blackout Actor and preventing movement
merging upstream