hacky workaround for #23