bugherd/#228 closed