Added support for midnight