Fix for livestamp