Fixed issues with @Attach annotation