minor fix
new implementation