Fix github issues/3