Bugfix begin/end