add build support + fix bug in callback