fix for some edge casey user errors