Added overflow fix