fixes for working default behavior