fix for bleeding edge
rewrite