Fix for SRAMP-262