Fix/base exception issue20