Crappy hack for Issue #137