Issue reported-by-me fix