Added eassert to cleanup assert errors