Should be better this way.