Fix for SRAMP-262
Merge pull request #377 from knrc/SRAMP-262

Fix for SRAMP-262