Fix for zero allocation