Fixed one more issue