#SERZ-5 Fixed