Bug fix from community contribution Tonils@GitHub