reverted and fixed bug