Pathetic attempt at solving issue #97