attempted fix #1