attempted fix #3