Another bugfix