Fully fix #35