Early bugfix