bugfix for guildeline