based on feedback from fenrir, looks nicer too.
(cherry picked from commit 8115853d)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>