Fixed an issue where the preferences were not being respected.