Patch issue 459

Simple and effective.