Review changes. Tested and works for me #492