rewrite
add silly workaround