attempt poor mans solution to #101