New attempt to fix invlunerability bug.