bug #814 - corrections