Improvement? Fixes #287