fixes #36 for real this time...