Workaround for #504