First attempt at fixing timezone problems