CON-307 | Adjust calculations with timezone