definitevly fixed preference handler issues