Attempt fix #16