Correct issue 11. Bug in compatibility layer.