Implemented suggested change (by joernhees)