Try to fix what James is whining about