Improve bug fix #57