Quick and dirty workaround for better performance