Bugfix for LastSync handling