Adjusted code to fit in better with rest of the code.

Hopefully.