* Fixed some obscure code