Fixes compatibility