Workaround for #33