even better fixes