STORM-505: Fix debug string construction