Temporary fix for stop command..