Properly fix #175