#15, #20 fixed