Attempt to resolve #369