Fix Clock to work