Fixed bugs in ekonomical part