* Fix handling preferences

