Commits 2733daf and 11d1b50 consistency