Pull request/96d27d55

Hoping this fixes previous issues.