Pgustafs 1097816

Added fix for 1097816

**TODO**
- [ ] Add a test to ensure that the correct arguments are supported.