Now we're getting somewhere!
Sorry, no meaningfull commit message again :/