0138: fixed stopAtEnd issue

#665