Issue762

Tested and working.