fixes MC-430
fixes for MC-423