Reverted version 1.5.1