Further fix #269