Fixed 3 time bug