Fix task #15 and #16