Fix identifier bug :bug: