Fixing bugs in business layer