Attempted fix #1