finaaly fixed fo sunjoyo