pulled and fixed little bug