#786 Fixed broken commit (2)