fixes #137 in teh original xebium impl