Solved #56 and #56.