Changes according PR #282