import end_pos calculated differently, fixes #137
also normal imports should return the right user_stmt, similar case than #137