diff from Alexander Hall <alexander@beard.se>