Update rem issue
todo - Fix later