fixes for certain conditions