Second bugfix