#662 - revert mistake :)