Another fix for complex expressions

Sorry for the extra PR. Upon re-examination within my project structure, I think this is the desired behavior.