Design workaround

Design workaround