attempting a fix #1