Adding a fix to dan's changes.... before I kill him.