Work around to a code recostrnction bug, it have to be fixed later