Fixed something that potentially creates problems