- added fix proposed in 393942d4235e8d2b8a746beb68014a1c380643fa