Temporary workaround for #3