re-fixed constants