fixed #12
fixed #9 + foreign fix
fixed #8