* Quick fix for speed