Bug fix github #4