This shoudl fix github #154