Fix submitted for this in #52