Fixed some assumptions I made. :/