Tiny bugfix from last commits