better looking workaround