better fixes