Fix after #5