Fixed TIMESTAMP vs timestamp issue