attempt fix #2