moved fix to right place