bug fixing refs #1580