Rebased #3965

Rebased version of @j00seph's PR: #3965
Didn't notice that before: We should remove the dot here.