Hacks together a really bad solution to resolve #36