Trying another workaround