Quick fix according to #42