Fix for Novell bug 519648

This patch fixes https://bugzilla.novell.com/show_bug.cgi?id=519648