added and fix