fixed bugs for the fixw