fixes for more situations