fix Hard Coding