not the prettiest fix.. but something for discussion