Change and fix pull #813

Please, review and approval