improved overflow behaviour