Fix #55, fix #56