possible fix #15, #4