fixed bug (from fix previous bug)