Fixing non number related clustering issues