eliminate confusion on shift times; closes #991