Another fix! No more hackings!