workaround for issue #2, will need to come up with something more permanent later