HotFix for return_timestamp error.