Fixed replacement when currently in Entity