Updated PR with fixme and test

Updated PR with fixme and test