moar bugfix?