fixing bugs MC-419, MC-414