Fixed issue #2215. Only the support in console is missing