Fixes #1439.

Fix for 1.6 version coming soon. Because my local git branches got screwed again.