STORM-186 convert 1000 to long to avoid int overflow