removed unsuccessful workaround and replaced with another.