Trying another strategy for the workaround