Hurried bugfix