fixing time and static references