Fixed (I hope, please @kzangeli have a look) in 1bb80bb