PR for attempted fix of #15