20141126 - Fixed limit expiry issue - see bug list