added some edge cases to ahandle if we encoutner them