Minor bug removal