Actually fix #287?