Fix for FF attachment support