Addressed Stefcho's comment