initial version fixed (again)