bug fix
Merge https://github.com/chwebteam1/OSP3A