Solved #44 and #45