Iss3194

Fixes