Fix for single attach