Some issues. and a fix.