CON-307 | Quick fix