assemly issue fixes