Fix for JIRA https://issues.apache.org/jira/browse/STORM-585