Attempt fix #15