fixes for the last change