Minor bugfix?