Fix for STORM-244