add fixes also