Fixes #77 with a quick fix that should suffice for now