Small bugfix?