issue / pull reuqest #955 I opted by this more simple solution
Merge pull request #1118 from conejoninja/955

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