Fixed up #5 and #10