Issue809

Fix issue #809, by shuffling preferences items around.