adjust handling of pre blocks