Fixed broken feature