Workaround for Issue 197