Compatibility bugfix