A possible fix #22