Fixed #374 and baubled it