One way or another, this will resolve #397
One way or another, this will resolve #397