2345 commit w/bug