bug fix from aproxacs