Corrected bug
Revert to original version