find/end/init fix