fix ugly construction