Fast bugfix