less hacky fix for %