Fixed small issue while keeping compatibility with old code