fixed megre issues