fixies from VrijVlinder
Other commit from VrijVlinder