fixed issue but not yet