Fixed a small bug freezing the App for 3 sec.