Minor functionality change