Fixed bug in the Base model;