Added suggested change from gtmanfred