Workaround for Issue 55