Wrong end date with multi-year fixed period memberships with rollover

Create a 3 year fixed period membership with start date Jan 1; set rollover day to Aug 31.
Sign up after rollover date and the membership ends in Dec 2016; should be 2014. (In this case 2011 - the current year - is "comped" and they are paying for 2012, 2013, 2014.)

if the member signs up before the rollover date, the end date is correct (2013) - in this case they are paying for 2011, 2012, 2013.

This occurs in online signup and in back-office updates