[STORM-537] A change after code review