[Fixed] - Redmine Issue 2024