Bus error bug fix
Bus error bug fix