fixing timezone dependency