fix #299 (for real this time)