fixed gross bug