working on a abug fix