Fix suffix keys implementation