workaround #40