fix @jaroel's merge