Workaround for st workaround