fix request #54