fixed bug (carry-over?)