BF: closes issue #162

OK this should do the trick.