should fix the timezone bug -> issue #2