Attempt to address issue #9 for SM5.

Not in best position to test out.