a naive approach at fixing #55