Fully fix #16