removed fallback - seems useless after all