Fixed minor bug: Timer not working properly