restored previous feature that was accidentally commented out