Fix a bit to agressive code prunning