Fix for STORM-417