issue / pull reuqest #955 I opted by this more simple solution