[BUGFIX] Compatibility bugfix