Fixes bug 1003483

@rhelmer r?