Fixed Model Issue