#481 and #478 - handling another scenario