try to fix issues #1