Properly fix #56