finally figured out how to fix #20