Bug Fix: Adding/remove to scene makes it dirty