fixing previous quick fixes