removed redundat optimization
sanity checks