Attempted fix #2