CEXT-681 #Fixed