bug #17 workaround

Does this do it