Properly fix #13