Partial fix for #28

Only applied to old alerts. New alerts yet to be patched