Fxing issue #301 with full details