Fix issue 12-13-14-21-22