Solved #122 and #88.