Temporary fix until we find out waht to do with settings