376 - adding conditional check