improvement for DESK-37