Proposal fix for bug 931

It's a proposal fix for http://bugs.racktables.org/view.php?id=931