Fixes issue 3168 Fixes issue 3347 Change-Id: I7722fe396e58f37cc60d10f54bb3a68ab63dbe7b Reviewed-on: http://gerrit.dmdirc.com/358 Reviewed-by: Gregory Holmes <greboid@dmdirc.com> Tested-by: Gregory Holmes <greboid@dmdirc.com>