Fix for all backends