Doesn't seem like this handler works properly. Need to investigate more properly