updated workaround to enable active state for buttons