#SERZ-3 Fixed