Pgustafs 1097816

Added fix for 1097816