Properly fix #25