attempt to fix ugly code...