still trying to nail down a fix