Closed #659 - applied suggested patch