issue 144 workaround