Fix some ugly changes in previous commit 378368b4ca05e1dee8be6228d7586ea83f5d80b8