bradrydzewski Fix for #2541