attempt at solving #214 - testing in progress