previous version was buggy