Minor fixed for better stability